Define gdk_xim_ic only, if USE_XIM is defined.

1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* gdk/gdkglobals.c: Define gdk_xim_ic only, if USE_XIM is defined.

diff --git a/ChangeLog b/ChangeLog
index a46bf323cbc8ebdf8d1626609c21fa36b21ea271..7b979b9adc761fcc5af1e72fb1ddc6b8ee7b028d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk/gdkglobals.c: Define gdk_xim_ic only, if USE_XIM is defined.
+
 Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.h: 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a46bf323cbc8ebdf8d1626609c21fa36b21ea271..7b979b9adc761fcc5af1e72fb1ddc6b8ee7b028d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk/gdkglobals.c: Define gdk_xim_ic only, if USE_XIM is defined.
+
 Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.h: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a46bf323cbc8ebdf8d1626609c21fa36b21ea271..7b979b9adc761fcc5af1e72fb1ddc6b8ee7b028d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk/gdkglobals.c: Define gdk_xim_ic only, if USE_XIM is defined.
+
 Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.h: 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a46bf323cbc8ebdf8d1626609c21fa36b21ea271..7b979b9adc761fcc5af1e72fb1ddc6b8ee7b028d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk/gdkglobals.c: Define gdk_xim_ic only, if USE_XIM is defined.
+
 Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.h: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a46bf323cbc8ebdf8d1626609c21fa36b21ea271..7b979b9adc761fcc5af1e72fb1ddc6b8ee7b028d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk/gdkglobals.c: Define gdk_xim_ic only, if USE_XIM is defined.
+
 Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.h: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a46bf323cbc8ebdf8d1626609c21fa36b21ea271..7b979b9adc761fcc5af1e72fb1ddc6b8ee7b028d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk/gdkglobals.c: Define gdk_xim_ic only, if USE_XIM is defined.
+
 Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.h: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a46bf323cbc8ebdf8d1626609c21fa36b21ea271..7b979b9adc761fcc5af1e72fb1ddc6b8ee7b028d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk/gdkglobals.c: Define gdk_xim_ic only, if USE_XIM is defined.
+
 Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.h: 

diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c
index 82162c30b3060f06b2470b1cfbf828761e800078..d0832767c782512312c0787c802d8ea76fc2dde0 100644 (file)
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@@ -55,7 +55,9 @@ gint              gdk_null_window_warnings = TRUE;
 GList            *gdk_default_filters = NULL;
 
 gboolean      gdk_xim_using;           /* using XIM Protocol if TRUE */
+#ifdef USE_XIM
 GdkICPrivate *gdk_xim_ic;              /* currently using IC */
+#endif /* USE_XIM */
 GdkWindow    *gdk_xim_window;          /* currently using Widow */
 
 GdkWindowPrivate *gdk_xgrab_window = NULL;  /* Window that currently holds the

diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c
index 82162c30b3060f06b2470b1cfbf828761e800078..d0832767c782512312c0787c802d8ea76fc2dde0 100644 (file)
--- a/gdk/x11/gdkglobals-x11.c
+++ b/gdk/x11/gdkglobals-x11.c
@@ -55,7 +55,9 @@ gint              gdk_null_window_warnings = TRUE;
 GList            *gdk_default_filters = NULL;
 
 gboolean      gdk_xim_using;           /* using XIM Protocol if TRUE */
+#ifdef USE_XIM
 GdkICPrivate *gdk_xim_ic;              /* currently using IC */
+#endif /* USE_XIM */
 GdkWindow    *gdk_xim_window;          /* currently using Widow */
 
 GdkWindowPrivate *gdk_xgrab_window = NULL;  /* Window that currently holds the